Fix the elastic check