Fix the right click issue