Fix double KVO change