context menu handler fixing