Fixed wrong item clicked bug