Fix bug introduced in patch applied in svn 2033 making it work properly.