FIX Gendarme issue with empty strings