Fix Issue #357