Followup bugfix