Fix scope reset so it doesn't have to wait for timeout