implemented GLClient fix to issue/658