Some critial bugs