Fix for non utf-8 characters