Hopefully the last required fix to make it compile with gcc again