[BUGFIX beta] Ensure with-controller is destroyed properly.