Fix Stretch / Top Handling
0.8.0