Fix deliberate hiding not ending correctly.  Closes #412.