Bug fix on organization