Fix for identify bug