Addressing 2.0 tool failure #33