Fix issue #216