Calculation values shift when adding an option