start of remove bug fix