Fix Issue #141