RESTWS-328: Follow up fix