[WIP] Fixed Migration Error