protect against another math error
Merge branch 'simple' into union