Fix bug introduced by code hygiene changes