Fix bug and support identifier