Bigfix on migration class