Fixed gendarme issue