Fix issue #298