[GS] Fixed #404