Fix for 2.6.35