Fix for unicode and composites