Fixed chunking issues