fixing bug
fixing bugs