Try to fix encoding problems in production