Fixes compilation against 2.9