fixed: performance issues.