Fix bug - right click on cluster