Reworked ets

Bugfix for some enconding issue.