Fix calc in repeated group (TODO item)