Bugfix: Valgrind reported unaddressable byte(s).