Fixed a bug with KVO