FIX some wrong type detection