Fix Issue #16