Fix for type in return statement