Tweak track item creation, should eliminate stacking issues