Fix option unwrapping in output