Example fix for issues: #610 and #606.