Fix for NUTCH-1890