Fixed observers issues on OSX