Fixing Observer dependances.