removed the short circuit