Reordered change triggering (Fixes Issue #2)