Fix Issue #131