Bugfix commit for issue #44