fix new bugs
fix new bugs