Fix of autocollect detection