Fix a bug introduced by previous commit's bugfix