First attempt to fix the selection