Fixed issue with 2.6.