Re-added check whether we're an other plot or ourselves