WS243 - some bugs