Finish bug fix