Fixed chunker to be compatible with Justin's refactor