fixing confirmation flow