Fix truncation on return. Closes #55