Fix issue #288