Bugfixes regarding issue #42.