Loop short circuit fix