Fixed Issue #40.