fix key expander