Need to fix this to compile with g++-4.9