fixed JH RP and WS