Fixed Re-Save bug

Some members still get saved twice, because the Resolve-Method can't
resolve everything yet