fix calculator selector