Fix another huge bug