Fixed issue with item selection