Updated for gcc4.8