Actually, we're fixing #99 again, not #105