Fixed truncating issue (issue #21)