HIPVM-603 fix