Trying to fix stacking issues