Bug fix for custom unit names