Issue #154: Fixing potential deadlock.