fixed the new bugs