fixing 2.9 / 2.10 bug