Better fix for chunk0, added simple test.