fixed debug build after merge