Jag/confirmation dialog fix