Fixed another bugs