Fix Issue #271