new for 2.6.17