Follow-up to previous bug fix