Restws ticket 332

Restws ticket 332