[Issue #77][WIP] Fixed previous migration