Missed 2 checks when moving to q 0.9.x