Fixed timeout bug!