fixed gaq code