re #750 - Improved migration