Fixed Issue #43.