Switch out commas before calculation. Closes #2471.