Fixing GSUB issues