Fix option defaulting behavior