fix bugs again