Fixes expand