backport !97 to 2.6