Reordered thing to work even if it is self