Fix problem from rebase