Fix, issue #65