Fixed #55 for primitives (not yet for groups)