diff --git a/include/nil/crypto3/algebra/curves/detail/forms/twisted_edwards/element_g1_affine.hpp b/include/nil/crypto3/algebra/curves/detail/forms/twisted_edwards/element_g1_affine.hpp
index 7f69c3bf..8867a6ff 100644
--- a/include/nil/crypto3/algebra/curves/detail/forms/twisted_edwards/element_g1_affine.hpp
+++ b/include/nil/crypto3/algebra/curves/detail/forms/twisted_edwards/element_g1_affine.hpp
@@ -138,9 +138,11 @@ namespace nil {
                          * @return true if element from group G1 is the point at infinity
                          */
                         constexpr bool is_zero() const {
-                            /* Special case for blueprint compatibility: (0,0) is also infinity */
+                            /* Special case for blueprint compatibility:
+                             * (0,1) is infinity
+                             * (0,0) is infinity too */
                             return (X == params_type::zero_fill[0] && Y == params_type::zero_fill[1])
-                                || (X.is_zero() && Y.is_zero() );
+                                || (X.is_zero() && Y.is_one() );
                         }
 
                         /** @brief
diff --git a/include/nil/crypto3/algebra/curves/detail/forms/twisted_edwards/extended_with_a_minus_1/element_g1.hpp b/include/nil/crypto3/algebra/curves/detail/forms/twisted_edwards/extended_with_a_minus_1/element_g1.hpp
index 9ecdc08b..9068e658 100644
--- a/include/nil/crypto3/algebra/curves/detail/forms/twisted_edwards/extended_with_a_minus_1/element_g1.hpp
+++ b/include/nil/crypto3/algebra/curves/detail/forms/twisted_edwards/extended_with_a_minus_1/element_g1.hpp
@@ -88,8 +88,8 @@ namespace nil {
                          *
                          */
                         constexpr curve_element() :
-                            curve_element(params_type::zero_fill[0],
-                                          params_type::zero_fill[1],
+                            curve_element(field_value_type::zero(),
+                                          field_value_type::one(),
                                           field_value_type::zero(),
                                           field_value_type::one()) {}