Fix for Confirmation

Fixes #127
Fixes #134