A bit more debugging in the relevant place.