Fix lack of short circuiting
Bump version to 2.1.1