Made short-circuit work correctly