New version of okaara with deadlock fix