fixed a broken hack that colin insisted on putting in
merge?