Fix issue after merge from master