Rule skipping fix (UNTESTED)