Chunk behavior fix