fixed regression from d62e6a811d09342f2e8a2c9af1e05f8c06ab212d
Matching working and good identification cheme