Follow-up fix to resolve failing unit test