richardhundt fix support for class rules