Fix issue #254