Douglas Campos when applying the migration work to master, let's address this issue as well