Github issue #218