Added missing condition-variables again ...