Fix issue #218