Issue 210 reverse handled keys

See commit messages for both commits for specifics

---

Tested okay in dev... just a simple reorder and preventative precaution.

Applies to #210