Fix Issue #43.