Fix autostretch handling

Authored by mutlaqja on Nov 5 2018, 9:03 PM.