Fixed save to work properly