Fix for distributor link timing issues