Major SimpleUnit/ComplexUnit bug fixed