Fix for Issue #720


@dwightguth please review