Fixed finish bug