Fixed empty string issue