Michael Schnell, thanks for the PR. We still need a test case added to it though...