fixing another bugs