Fixes bug with saving to account