Fix needed to move the change from the commit phase to the prepare phase