Fixed namespace issue with gcc