Fix Issue #39