Fix Issue #339