Fix for GY