Chunk fix

Added chunk-fix to master