XXX: additional hacking.