imporve Singular constraint for all positions