Changed unit value to be OK for floating values
Merge.