Fixed short-circuiting
Fixed regression