Fix #3380
Fix a regression from the previous commit