Now compiles with gcc 4.4.7