already I have fixed TWO bugs