Fix for HEX-1858