Hopefully fix a bug. Put the deactivate-mark thing on the outside of everything.