SELF_LINK fixed