Fix to set wrong values