I guess the fix by Walter will precede this commit, I'll revert it then.