organization bug fixed