Fixing the issue related to chunking