Fix lockup from 08407c4. Close #23.