Issue #488: Onset migrator can fail in certain cases
Fixed.
(cherry picked from commit 0826557458438ec168f1125fa102046950313ea6)