Moved disabling piece so that it doesn't happen unnecessarily.