tempoary fix until next GCC