Optimized logic for random cone scan
fix conflict, bugfix