Fix plain old C mode for real