Temporary fix.

Note: the Fragmenter stuff is being refactored in a branch.
You should drop this commit when merging.