[GS] Fixed #397