Follow-up fix for unitialized values issue.