Fixed Issue With Encoding