BS-11784: fix issue, need to write non-regression test