Try to fix scalability issue.