Fix the Open then cancel bug