Try to fix gateswith serverstep code.