Solved a freezing issue with saving