Added fix for new confirmation screen