6/25b fixes another, different, but equally vexing lock-up bug. Apologies for the rough release everyone!
