fix issue with identifiers