Upgraded to work with GL 6.2-stable