Issue #670 Fix

Fix for #670