[Bug fix] performance issue