Fix issue #46