Another attempt at fixing GCCs issue