BugFix: Model callback this context - revert & advance reinstated