CON-68 bug fix