fixed gm issue