Fixed failing build after merge