Fix issue #269