new validation logic because of samsung galaxy