andrewvasilchuk and marijnh fix: types