Added control for empty string