fixed short circuit mistake