SSKVOFix.h

#import <Cocoa/Cocoa.h>

@interface SSKVOFix : NSObject {
	NSMutableDictionary *kvo;
}

@end

SSKVOFix.m

#import "SSKVOFix.h"

@implementation SSKVOFix

- (void)addObserver:(NSObject *)anObserver forKeyPath:(NSString *)keyPath options:(NSKeyValueObservingOptions)options context:(void *)context{
	if(!kvo){
		kvo = [[NSMutableDictionary dictionary] retain];
	}
	
	NSMutableArray *obj = [kvo objectForKey:keyPath];
	if(!obj){
		obj = [NSMutableArray array];
		[kvo setObject:obj forKey:keyPath];
	}
	
	[obj addObject:anObserver];
	
	[super addObserver:anObserver forKeyPath:keyPath options:options context:context];
}

- (void)removeObserver:(NSObject *)anObserver forKeyPath:(NSString *)keyPath{
	if(kvo){
		NSMutableArray *obj = [kvo objectForKey:keyPath];
		NSUInteger index = [obj indexOfObject:anObserver];
		if(index != NSNotFound){
			[obj removeObjectAtIndex:index];
			[super removeObserver:anObserver forKeyPath:keyPath];
		}
	}
}

@end