Fixed WS stuff