Sarah/Vivian | fix migration