Attempt to fix migrate issue