fixed encoding problem from master, use version from master