Fixed for gcc/clang compat