identity bugs - fixed