Fixed double-link bug