Another selection drawing fix