d.o issue #2013543: better migration