Fix issue #215