further fixes for subsharing