HIP-1251 fixing previous commit for this issue