fixed from eric's src