Bugfix for issue #32