Fixed right click item issue