Fix to legacy formats