Fixing an issue where observers could block and screw everything up