0.9.2 dead-lock bug fix