Fix for the fix for selection