Fixed Issue #38