fix current value issue