Issue #350 fix