Short circuit fix