make migrations more stable