(hopefully) repaired the timeout bug