removed double encoding
Merge branch 'bugfix/double_encoding' into develop