fixed ws call problems