Migration issue fix