More recent 2.6.8 versions need this change too