fix and disable timeout