added fix for encoding issue