Hopefully another fix for gcc