Small tweak to model.off to make sure other events aren't lost