Updated for 2.7 and fixed disabled GB issue