Bugfix for issue #64