Improve aspect size handling