kinda fixed bug with saving