context menu handler fixed