Fixing compatibility issue with old gcc (WIP)