Actually fixes empty string evaluation