[GS] Fixed #406