fix Windows encoding problem and revert last change