(fix) fixes data persistence issue from transfering between states