Improve short circuiting