Merge "Fixing a regression I have introduced."