and fix migration