Affliction hazard. Refactoring