starting bug fix