RESTWS-368 Fixed things