Fix Issue #38

Fix Issue #38