Fix issue #296