Bug fixing in performance