clean up 44fc92c3 (not a threading issue but sigc++ problem)