Hi, i have a PR that fixes issue #3348, it would be great if someone could take a look at it and review the PR @Peer @zomars