not really a bug, but avoid a redundant re-calculation of the unit (fixes #1)