Fixed another issue with removing observers.