Added fix for LH#1934.