Edit for GCC support