Fix empty string problem