Change to get around gnu compilation warnings (v2)