maybe moving this up fixes save