Finally fixed legacy cucumber bugs