Fixing performance issue introduced in last change.