Fixes for ISSUE-688

Fix and test for Issue #668