Fix Issue #18