Fix: Updates to PR #650