Better unlock _before_ returning