fixing the RESTWS-284 ticket v1