Fixed critical violation - Review #7233