Yet another try to get this right.