Fix Issue #167.