Fixed the CGL issue to make Travis happy again