Fix extra in case of fragmented sources
Unicode support