Fixing GT problem