Fixed timeout bug introduced by commit e81a6ff