Try fix migration failure from 2.5.1