Addressed review comments on short circuit condition