Fixed bug with empty strings