Identification bugs fixed