fix small merging bug in 2.7 version where gcc complains (OS X)