Fix for latest functionality of the format script