BKNDLSS-7524 - fixed