Fix short-circuit issue.