Merge pull request #990 from jay-hodgson/release-43

SWC-1436: fix chunk calculation