Fix safe response