Fix for wrong values