Translations and bugfix

This is not so elegant, but it should fix bug in #23