Fix for collected and visited