simplify condition
adapt to new signature of fixHygiene