More rules cleanup, bug still reproducible