Fixed Issue #40