Violation fix