Fix issue after merge