Further attempts at fixing extra bottom space