[#70939478] Fix units #1017

@asparke2 please review