Bug CON-94 fix