Added ability to turn off short circuiting.