Fix up previous hack