Fix to support gcc compiler