Fixed RSM, it was problematic in some scenariosgit add server.py