Close GH-20: Fix bug and more.