@Ole-Kristian, this has worked beautifully for me (iOS 15.4/Xcode 13.4.1). I had a less elegant solution and replaced it with yours.🙏🏻