Fix option stacking bug