shared bugfix part 1