Fixed MX to support completions