fixed wait added timeout