Restws ticket 331

Restws ticket 331