Oops, fixing issue introduced by previous commit