Another bug fix attempt

That’s a big dog!