fixed new bugs