main.m: The real fix