BS-10249
fix migration issue