need to fix selection