fixed encoding hopefuly..