CON-365
bug fix