fix regressions introduced in 71b9c0a