Fixed empty string case