Oops -- should have been in previous commit also