Fixing types 2