Followup to d897aa5; fix crash on Mac