yet another yellow-car bugfu