CON-273
bug fix
CON-273