fixing broken build after merge