Fixed weird GPP issues