Updated for Gcc4.8