Fixed crawling logic