- Fix for more sharing bugs