Multiple types fix