Allow refake even without schema-id; fix