Fix issue for selections