This looks like it caused #94