Identifiers fix