HIPVM-615 fixing NameError