Fixes #16: Convert units in controller edit method