Post-rebase fix #2