Fix hideous regression