Fix Issue #336