Bugfix for issue #62