Fix Performance Issue