Quick f*x for #65