Tried to fix gendarme issue