[DF-834] fix boundaries