Fixed violation #2