This fixes Issue #348