Empty string bug fixed