Refactor on fixed to Violation