Stop passing duplicate parameters in expand