Bugfix for remainder chunk handling