Added fix for Image Review flow.