another fix after changing member names