Fix Issue #352