Fixed some problem with crawling