Temporary patch for low-level KVO bug