Fixing expansion to work properly.