Bug fix for zero-lengthed strings