removed empty string check