Fixed Migration issue