Fix double finish