fixed types with previous changes