add diagnostic snapshot workaround