fixed issue #216