Add organization prototype part 7 bugfix