Fix for gdc