#4 -> Fixed Pre C++11 builds