Fixed Share Bug with use of DataSource