simplify my last commit. Thanks to obo for the hint.