Change to strict encodeing