Fix mixed-mode