Fix issue #293