wait fix and other timeout