[GS] Fixed #408