Issue #673 Corrected