Fix issue #267