Fixed empty string bug