Making it more robust and future proof And fix issues that it creates Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1093>