fix new bugs