fix cant share at second time
merge code