Fix for encoding problem