Fixing regression from previous commit