Bugfixed observer handling.