Re-add chunk checks...whoops!