BS-7350
handle duplicate