redo possible ws fix

Change-Id: Idf7a5c45c58a0650ee88be1749bc4e353e808014