Made it work for me, not using c++11