Solved new bugs