bugfix relating issue #143