Fixed the double stacking problem