Oops, fixed a bug in #8