Issue #488: Onset migrator can fail in certain cases
Fixed.