Fix a related bug