Fix elastic check