fix doing short circuit