Fix Selector message refering to itself