Implemented recursive links fixup