Fix double save options bug