2.6 fixes #2