RESTWS-370 Fixed things