made safari handling future-friendly