Fix double chnage value calling