More rules cleanup, bug still reproducible
More rules cleanup, bug still reproducible