fixed?
fixed issue
fixed chunking logic