CON-1251 | fixes 1