Fix for non-ascii data