Fixed FinishBug