bugfix of org attribute logic