V0.24 fixes #104, fixes #102