Fixed stacking issue