Fix 875

Fix for issue #875 updated to resolve merge conflicts.