Another try to fix links