Changed for latest GCC ambiguity