CALCULATION Wizard - bug with hyphen in values