Followup bug fix