Bug fix, double finish