Quick performance fix for link it for RC21.