This fixes Issue #346