Fix bugs by broff