Changed share code behaviour