Fix issue #265