Fixed confirmation message issue