Fix option saving