Fix Issue #311