js-migration final fix