*3.12 fixes #12