fix issue 49, identifiers; fix issue 62 tag 504