In process of fixing performance issue