Yet another fix of the last merge.