BKNDLSS-7644 fixed