re #878 - Improved migration