Migration fix #2