Expander fix