Bug fix for key value observing removal