Fixing uhrmensch issue #49