ticket:5 migration correction