Fix a bug introduced in df93a681 'Merge the push...'