Performance bug fixed