Fix CHA behavior
Fix a bug around resetting origin mode