Fixed stacking issues