restws-331-fix