Another attempt to fix encoding problem