Fix stretching issue