be more defensive during migration