Oops, previous commit doesn't fully address case.