Huge major, totally non-hacky fix