QUICK-FIX Overzealous selector updates