Fixed issues with slow computers getting infinite delay