Fixed bug with null-termination and string containers.