Fixed bubbling on OSX