Additional GCC 4.4 fix