BugFixes I - fixing expansion