Fix major violation