Fixed linked bugs