Will now append EOS char even with EOI used