another edit for 2.7.x