Use isTruncated instead of Marker as per #11 and #10