Artellando ES, thanks for the feedback.
A pull request with a fix and test case would help get this fixed.