another fix to message migration