- another non-recursive bugfix