Improved Bounds handling with small shapes