start optimizing for v2.2

prevent short circuit