fixed encoding issus