Resolve Issue #125.