We may want to merge #396 before addressing that bug.