Fixed the organization event bug