Bugfix when c++0x is not available