Fix bug where Option destroys too much