Issue #670 Fix