Fixed a migration issue that arises with the master merge