Fixed unfortunate un-compileness after merge