Small fix related to the recent change.
Fixes to get it finally right.