Fix for empty strings (previously '' was just removed)