Short-circuit fix