fixed define types not getting expanded