Fix calc in repeated group (TODO item)
Merge pull request #779 from Sophist-UK/fix_calc_in_repeat_groups

Fix calc in repeated group (TODO item)