Fixes VIX-565: Standard Starburst linking