Fix for issue #818
Fix for issue #818
Minor tweak