minimal changes done in order to fix bugs on member creation