Fix on format lookup bug