fix bad rebase i.e. extra _base removed