Fix Issue #216.