Fix Issue #168.