Fix a regression
Fix another regression