FS-5761
fix for todays ws.* changes