Updated for mutex/condition fix.