"Fixed #3" Follow-up