Fix more panel bug