Empty string problem handled