FIX for CALKEY-182