Fixed issue after merge

Fixed broken after merge