[GS] Fixed #405