MPS-20400 Completion is broken on Mac