trying to fix migration mess