Quick fix migration