Issue #787 Fix