BugFix V - Expansion bugbash