Fix chunking problem