Fixed stretching and saving