fixes at GS-358