fix bugs too