compiles and should work under 2.6.24 now