Small bugfix fork of CMU Ark group