Fixing watch edge scope shifting/matching in progress