CON-325
bug fix