Fixing checks related to check_dist() change