[GS] fixed #396