Updated for use with GCC-4.7