Need to fix g++-4.7 issue