Extra empty string fix