Fix for TestWatchpoint