fix for CALKEY-181