Fix oldformat/newformat confusion