expand correct items
Fix madness