Fix bug in Context Menu