Fix for empty WS