Fixed conditional short-circuiting