Fixing issue #710

@dwightguth please review