Added end of day short-circuit check